Skip to content
This repository has been archived by the owner on Aug 27, 2022. It is now read-only.

Feature: livekeying #157

Merged
merged 37 commits into from
Dec 21, 2020
Merged

Feature: livekeying #157

merged 37 commits into from
Dec 21, 2020

Conversation

andi34
Copy link
Owner

@andi34 andi34 commented Dec 19, 2020

Prerequisites checklist

What is the purpose of this pull request? (put an "x" next to an item)

What changes did you make? (Give an overview)

Is there anything you'd like reviewers to focus on?

@andi34 andi34 closed this Dec 19, 2020
@andi34 andi34 reopened this Dec 19, 2020
@andi34 andi34 requested a review from joiyco December 19, 2020 19:14
@andi34 andi34 added this to the 2.11.0 milestone Dec 19, 2020
@andi34
Copy link
Owner Author

andi34 commented Dec 19, 2020

Might also fix #139

joiyco and others added 24 commits December 21, 2020 10:45
Change-Id: Ia4d96a9bad74b1a2a6cbddd2c83676c40b2e296f
Change-Id: I219d654617d328833ed73049d8d050a0ec443907
Change-Id: I79983e3d0e2142f284827981b4a77da154fc3640
Change-Id: Ieb867468d251f1f284029082e686f556f6b9ad13
… fix lint errors

Change-Id: I674f661a4ad9cfa80cb162fd13a04d393b360b41
Change-Id: I7a99a6eeab9e56debc0f7f15bae0e057fcb7a30d
- show info messages
- check if buttons are visible or hidden

Change-Id: I1913b687dbc049b51dbc4996c10ad96c4a4251ff
Change-Id: Ida6b771930a1a1a6e9a3bcaca0b3649c3d43e1d2
Change-Id: Iecfc15a90ee7303325e04ed39c57e3469567a73c
Change-Id: I674e2950295b91ac23ca37694ddc5125c99a8d26
Change-Id: Ica29009f14486d1365061e3d1f5c3bad169f49c9
Change-Id: Iac9353295faed3a19e4ced8fb59c826774b970a6
Change-Id: I5464625042d1f8dcd2f890b0e46b677c25c36b11
Change-Id: If5f75f57fce3c91f84d4c9ab42bb28088cd7f700
Change-Id: Ief65d4885eac5449b6e0190a27a3d12df0bf911b
Change-Id: Ie3c180861afb7ed5c7a5e4326e224d59f68d5892
Change-Id: I6f1618c73be5bc5c221850087aa3cc0625f2d65d
Change-Id: Id03568c262cf9bfc641de7868dbe436e3a61939c
Change-Id: I7289035d2021104938c646dd8f7de4784bb32105
Change-Id: Iaf8ba3eaee3a1376218ce5a38f4626c778fb526b
Change-Id: I45bfb23058c89bbbfd1e6d919788974340784488
- original images shouldn't be deleted if $config['keep_images'] = true

Change-Id: Id0d0fae31b36e3c7e9b35e2d81115a69b826bdd0
- we always check if the file exists and is readable

Change-Id: I46372c0a46ee36b9f677098301fd36624c1c4e87
andi34 and others added 13 commits December 21, 2020 10:45
Change-Id: I90973ed13fe963e628984b0434a2b153f20e9c13
…oma keying

Change-Id: If066caa1749b473212cd742eb41a9de6e7c67ef8
Change-Id: Idf3aa366f5892ddf06048b7f530a882aa85c66c0
Change-Id: I1414cb0bf2f2c40f848cca5439ecf1689b741acc
Change-Id: I877bc4e1611b08a022706c76fc7dfbd138d1b981
Change-Id: I455577fa9a2077d3adb46b778102f50f325caf12
Change-Id: I7c41381b4a5fb295d1e83c7419fcf5bfaae4f875
Change-Id: I701ba4f8b26facfbf2a737c05416762132a3ecdb
- inside core.js we need to check if triggerPic or triggerCollage
  classes exists, if not we'll ignore the key code trigger

- inisde livechroma.js we'll check if a background is set, if not
  we'll ignore the key code trigger, we'll also ignore key code
  trigger if we should reload the page to take a new picutre.

  collage isn't possible yet on chroma keying, instead we'll
  also trigger a picture.

Change-Id: Ic48d923e57cc728f2974b97346933e1cb05306ee
Change-Id: I250c7f02da5cc3bd28cb931d8c4b5bbad7414b7a
Change-Id: I808b0818585c2a3137c9e9824332fc11677befb5
Change-Id: I20bef0cb8d0b357e0c74300d3434b8fb8d24c8bf
Change-Id: I1ece90a1cebe0df45c53d78f4e0218494529daad
@joiyco
Copy link
Collaborator

joiyco commented Dec 21, 2020

Ready to be merged 👍

@andi34 andi34 merged commit 1536a69 into dev Dec 21, 2020
@andi34 andi34 deleted the feature/livekeying branch December 23, 2020 10:15
@andi34 andi34 modified the milestones: 2.11.0, v3.0.0 Feb 28, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants